Merge remote-tracking branch 'upstream/master'
authortsteven4 <tsteven4@gmail.com>
Mon, 8 Feb 2016 12:58:53 +0000 (05:58 -0700)
committertsteven4 <tsteven4@gmail.com>
Mon, 8 Feb 2016 12:58:53 +0000 (05:58 -0700)

Trivial merge